Made the multi-threading cleaner and use less code