Cleanup. Added list function.