code refactoring for the assistant
asdasd
Code cleaned and ready to send to the assistant
removed last stuff