Cleanup notations and definitions according to Sven's and Tobias remarks