Changes:

Improved application speed,
Small message and variable cleanup