Cleanup

You complained at Deepsec you only had one pull request so far. Here is number 2 :D