Consistency/style cleanup