Cleaned up some lifecycle methods