Cleaned Initialize, etc.

Cleaned initialize and the functions called from Initialize.