Revert to 505.1.0 for docker 1.3.1 & fix formatting