Code formating issues