style consistency/cleanup