Cleaned up the presenters and refactored some of the functionality