Code maintenance, made it look pretty and removed unneeded code from the files