bug fixing and code formating obey google style