Some clean Up