#48 #50 Added comments for clarification based on code review