Removed Greek comments and Refactored Code