Refactor, add more feedback, remove debugs