Cleaned up comments and doc strings