cleaned
basic structure