cleaning up and simplifying
removing unnecessary shit