Command Handler cleaned up a bit