removing astyanax + refactor