Changed private field name and some other cleanup