Refactoring & style fixes
style fixes