make code sensible and improvements