more clean up. Names and simplifications

Some functions names changed to match conventions.
removed "between" function, as the same can be achieved easier.