prettification
fixes based on code review
changes as per code review v1