removed suffixes from static functions and some minor changes