Cleaning code before handin

Signed-off-by: Anders Bech Mellson <anders@bechmellson.com>