Cleaning up command calls

Gonna branch off a new one