Refactored
Little update
Quick fix
a bit better variables