Minor cleanup + added startsWith to DSL