Code cleanup, style