Code cleanup and optimize imports
Refactoring secret box signature