Merging of logic and some renaming. Remove negative boolean.