Improved comments and ordering of methods for diff ease