Sourcecode cleaning
Sourcecode cleaning