fixed up messy code