Refactor

Refactored onCreate methods