#77 Code review final