Code formating
cleanup