Simplified if/else statements...

Still have to add shorter cmd's (aliases)