Coding Style improvements
Removed code complexity