Follow code conventions
Merge pull request #661 from gasull/code-conventions-ubuntu-installer

Follow code conventions