Minor style fix and cleanup old file