Simplify step class
Lot of small fixes