Fix formatting
Cleanup code