Code Improvements

Improved Indentation