Cleaned up
quickfix