removing unused, making prettier