Cosmetic changes

A few cosmetic changes to follow docker style guide