Cleanup, style changes