Rearranging for Autotype
Refactoring Commands and Placeholder