Bound limits to customizable properties and code cleanup