Polishing.. fixed formatting and minor redundancies