Cleaned up white space, updated to-do
more cleanup