Cleaned up some code for helander