Refactor/rename and cleanup.