style fixes
Cleaner code and coding style enforecement