Fixed miscellaneous issues (such as w/conversion) and indentation