Cleanup of code + update localizers list