Start fixing code style