[Tak] Improve Style