removed switch case stuff
spacing