Touching up code