cleaned up unnessesary code