#180 Code review