Refactored, tweaked some default values