general cleanup and line length enforcement
reduce needless varaible declarations