refactoring

changed Character to User to simplify work,
changed method and variable names,
etc