Fix codestyling issues