Refactored various bin files.