Cleanup a little bit

This may cause me problems, but let's see :p