Added translation
Cleaned up code