Format update. Made sure all code follow the same format