Finished prettifying to fix #94