Fixed some messy code