minor edits - made two properties private