cleaned up names and combined statements.