Fixed some too verbose code style