Ignore file and a little cleanup