Refactored instantiation of dalek core library