General Refactor, :maki:

Todo: error checking