- cleaning up source layout