Some more code formating