* Cleanup code style to completely fulfill ruleset