Cleaned up helpers a bit

Just some small cleanup. Trying to get all the helper functionality as clean and clear as possible, as in the next version we should switch stuff around. (so we can remove the Pavlov.old_stuff)