Made it purty-er, code-wise, that is