Improving aim
refactoring aiming state