Cleaned up LifeCycle methods