Add commentary and clean up