Changed stuff, removed print statements and useless code