Fixing PEP8 issues, removing un-needed break and implementing DNR.