style fix, code cleanup