cleaner naming
fixed merge conflicts