Cleanup (bring code inline with project conventions.)