remove loggings
refactor math scope