Some tweaking of nitty gritty details
Simplify