Cleaned up and streamlined a bit