minor code refactoring
Fixed : minor visual warnings