Improve: loading routine
Fix: CS + DocBlocks
Remove: unnecessary cast to bool
Add: cast to int