code cleanup
style changes