#189 Coding style fixes; added empty newlines at end of file etc.