code cleansing, tune layout