Cleaning up public facing API