Merge style change and controller linting/documentation.