Code cleanup: style