General code layout cleanup for easier development