Better wrapped line movement
Removed duplicate declarations