Cleaned up source code
Sorted members