Clean code and add new comments