Removed crap stuff, improved readablity