Made indentation consistent.
Resolved aliases.
Change strings that do not interpret values.
Added parameter names for some positional parameters.
Merge pull request #1 from darkoperator/master

Indentation, spacing and correct alias use