Give more descriptive names to the source and library variables and split