Cleaning up source. Last commit worked (untested). This one will inevitably break it.