Cleaned up build-monitor code