huge style & logic update