Refactoring
Refactoring
Variable name refactoring
#each: some fixes

TODO: in case of splice