Basic Refactor

Nothing special