Finished renovating core library code