code format cleaned up