Cleaning up abstration