comments + minor package refactor