Clean up, simplify formatting, rename list method