Fix, move most to single line code