Added comments
Clean-up and reorganise
Added a region for the capture