removed many WTFs