Cleanup code & styles