clean up and style updated