Cleaned up initialized code