Added more possible arguments and fixed indents