Refactored method names, reorganized setup methods and removed pragma marks