Slight clean-up.
Initial Refactor