General Improvement

Signed-off-by: Condor <condor616@gmail.com>