Cleaned up
more cleaning