Code layout compliant to Rubocop 0.16