Refactored.  Eliminated extraneous if...else statements and split up checks for valid moves.  Used Hash#merge! on options hash