Spacing

Cleaned up the structure; Deleted test comments
(Only to get familiar with pulls/merges)