refoctoring and language issues