Better parameter separation and clean up