Cleaned up some comments from code for active record support