Also changed order and removed whitespace to make portlint happy. Approved by: bapt/culot (mentors, implicit)