cleaning up a bit again