Style fix, code cleanup