Cleanup
Code style