Cleaned up some comments and ParseManager