Added translation messages and configs and cleaned up code