Removed commented code, made it more 'Matrix' friendly