Cleaned, removed warnings