Cleaned logic
Cleaner