General code cleaning

Line scraps