fixing style and basic clean up