cawka Adjust style and few other small adjustments

Latest commit 337da9f

Dec 22, 2017