Build0004 & Refactoring