cleaned things up, submitted solution 2!