Cleanup and slight changes
Clean up White Space