Cleaned up initalize method