Added cursorline and cleanup