various code cleansing