A little debugging and cleaned unnessecary code