More cosmetic changes

Renaming of some functions, removing superfluous typenames