Reduce codes
Modify message
Move upload handler to 'tool'
Add note