Changed some codestyles