further cleaned up codes