removed even more unnecessary imports and cleaned the code a bit