Comments + tiny refactor