changed formatting, added "this" keywords