Fix issues in code style