Refactoring

Refactored 02, 03, 04, 11