Refactoring + Bug report sample added