Refactoring

Signed-off-by: Anonymouse <anonymouse@MacBook-Pro-Anonymouse.local>