Remove debug statements
Cleanup whitespace
Add image password parameter