Comments and bytecode cleanup