removed debug statements, formatting