Improved code layout
Changed version