Additional source formatting/cleanup