Some makeup in favor of readability