Cleaned up, comments on some methods