changed shortcuts and some indentation