Code cleanup, style fix