Some clean up for readability
uncommented stuff