Clean up here and there

Signed-off-by: Alexander Berntsen <alexander@plaimi.net>