Final commit

Final tweaking cleaning