Small code cleanups

Signed-off-by: Lukas Fleischer <calcurse@cryptocrack.de>