cleaned up and made minor design changes