Refactorization / Cleanup