Final tweaking of content and code cleanup