code style and improvements