motor test and general neater formatting