cleaning up
continued + style
style
adapted to refactoring