Code formating cleanup