remove whitespaces and some leftover code from testing