Got rid of the wrapper function.
PEP8 fixes..

Just fixed the one that I encountered.