[Issue #363] Fixed translation
[Issue #363] Fixed code according to guidelines