Code cleanup/formatting