fixing formatting and class properties