removed some logs
added todo
refactored code to accommodate dependency on foreman