Improved readibility and removed forgotten unused removeFrom method :)