Removed redundant case; cleaned up printing slightly