minor formatting changes
removed unused member variables and reformatted code