Cleaned code a bit and commented why this is really neeeded..