cleanded up a bit and removed useless stuff