Removed finished Todo :D and optimized code!