Simplifications and code review

After our meeting on Friday 20/6/2014.