Adhering to pep8 and cleaning documentation

Change-Id: Ic57d7de0c7150a7349c6474e1ca6499e94c0c53f