Changes in order to comply with PEP8 and roslint