Do not used deprecated function names anymore + remove whitespaces