complete refactoring

[redstone-dev]

i tried to change a few things and...

what the h*ll is this code, i can't read any of it lol (no offense, i just think a refactoring is in order to make it more readable)

[jdev082]

I agree. Take #473 into consideration when refactoring.