#13 - done (Promote) + style improvements