Fixed formatter & commands