Making some updates and cleaning up