Fixed minor code style issues mentioned by codacy tool