cleaned up even more