babySteps - clean & doc