Code cleanup

Various spacing added so that deleted lines don't ruin formatting.