refactor
housekeeping
Fork or update when necessary #124