Revert "Shorten functions with bad marks..."

This reverts commit 80090d387b824be86a5d8f840039c8638351ec81.