Bleh, some cleaning