completed code changes as per code review and Brandon's suggestions for styling