Made some changes to follow the standard python coding conventions