Fix code styles issues