It has begun! Refactoring!