Reorganized setup methods and removed extra pragma marks