Fixed indenting, made code more efficient, rename package.