Still need to make target and source output cleaner