Style cleanup
Added tests