added naming and some cleaning