Refactor 1st

#77