#81 Code review