Made code style consistent