Add refactor changes

Do what #58 was suppose to do...