Cleanup: Fix code format, remove hardcoded value and add some documentation
Merge pull request #1243 from cinaera/pr_fixes

Cleanup: Fix code format, remove hardcoded value and add some documentat...