Code review/cleanup/test coverage