added pycharm and cleanup

Change-Id: I9f56b5f45fad986efd263f229330a33c08fc9314