cleaning up some poor code style