Style changes and code organizing