Cleaned some comments, added extra helper methods