Fix code styling issues