Cleaned up and changed default value