Updated comments and removed unnecessary return