Cleaned up code/comments