More cleanup - separate in files