Removed messy code