cleaned up

needs more cleaning..