Cleaned up methods

Minor readability changes