restructured

fixed hardcoded value