Code cleanup with use strict; better comments