Makes edits based on Logesh's feedback

Thanks @ldharmar ! Any other suggestions?