Code tune up