re- factoring/- formating code