Code has been cleaned and reformatted to unify code formating, as
some format elements were not consistent (e.g. mixed single and
double quotes, missing ending semicolons, etc.).