Indentation, spacing and correct alias use

Made indentation consistent.
Resolved aliases.
Change strings that do not interpret values.
Added parameter names for some positional parameters.