Cleaned up Init code