Updated comments and some param names for readability