refactored some stuff, more semantically correct names