enforce style-guide #3, #26 and #27