Made the code look more like the way it should

Getting close