Cleanup and add help flag