TODO updated
Organized import
Set UTF-8 as default encoding.
Refactored code with abstract class with common code