Sanitizing

Cleaned up some default values