Renaming things; style
More readable code.  Fix old issues with limited memory scenario