Resorted Code and deleted old unimportant stuff