Cleaned up the project a little for ease of reading
Merge branch 'development'