Cleaned up with HowdyMaker