Simplifications and code review