pyflake removed
indenting cleanup