Code cleanup, style cleanup