Code Clean-up

Fixed syntax issues and applied consistent coding style
Code Clean-up Addition