Clean Up Hackish Code