Format and fixing errors...