style
Cleanup code