Code cleaned up and ready to go