Code review for abbot project