FEATURE: add oneboxing ;)
Minor refactoring.