Began with documentation and some renaming for simplicity