Improve readability or something