Changed default no value, cleaned up file