Documentation, tidy code