small style changes
style changes+cleanup