Comment cleanup cleanup cleanup, I should probably stop now...