More code and cleanup! yay