Cleaned up

what a mess! :o