Code cleanup
Line numbers fixed (from master)