Cleaned up comments and return statements