Refactor of first three dissertation chapters