cleaned up the statements a bit