First round of changes as per pull req feedback