Mostly a refactoring. Also, debug functions were added for ease of life while debugging
Attach a file by drag & drop or click to upload
