srccheck: moved lines longer than 80 chars
Clearer function names for initialization
Function names conform to dev guide
Merge Lukas fixes