Initial code review of current code base