Various visual improvements
Code style improvements
Code cleanup