fixing my todos so that @barisusakli will sleep tonight. and linting.