Various code style improvements
fixed "just_copy" plugin bug