Cleaning and refactor + Boss behavior small progress