enh: cleaned up options