just some code cleanup and reformatting