Making some changes and cleaning up!