Refactor

This can definitly be a problem. Whoever sees that, please tell me if it can bether you, and how we could handle it better.