Refactor & moar comment