Minor changes, renaming. Coding.