Some clean up here and there