Fix/bugs refactor methods