Fix #4: Improve readability of last commit