Code cleanup (pepparkaka remix)