massive cleanup and making it less silly