Improved styles

Improved styles and code cleaning.