Cleaned up trailing spaces, blank lines etc!