Refactor and added bugs description