Minor code cleaning. (pythonic way)