cleanup
style