small changes for better code and style