Refactor && remove duplication
Fix black background