Cleaned up commands a bit

now with less redundancy?