Some refactoring and a great improvement in fps (300k FPS Holy Shit :'D)