Polish up code and typos using code inspector