Made code PE8-compliant