Improvement

Removed unnecessary codes.