some beautifying chenges
some changes StyleGuide