Tidy + re-arrange source