change author name and remove unnecessary code