Removed comments, cleaned up