fix
formatting
Merge branch 'optimizations'
eof patch