refactoring. clean up.