Non functional changes as requested by review comments