code cleanup, changed default path builder