More shifting of code for readability. Also took out some unnecessary comments.