Address things pointed out during review
Change code style