refactored the Command Parser a bit.