cleaned up things