Started cleaning up chapters