Cleanup, added header and list options