Checkstyle cleanup, simplified map, started adjustor code