Cleaned up comments and docs