Marginally improve efficiency of some statements

Also make some variable names more Cyder-agnostic