syntax changes and optimizations
cyclomatic complexcity issues