Code cleanup and compiler compliance