Final revisions on removal of arbitrary logic and indentation issues