Minor cleanup

Created by  Fabian Neumann  on January 27, 2018
C3V7QDZ54SY3VYOVRSNOACGAR3UVXD5W5SJYDV7QPMS7RYDM5Z5AC
Change contents