Fix bug and clean project