More aesthetics
Code cleanup and commenting