Refactoring, removed unneeded imports, made code more eye-friendly
Life no longer imports or cares about STATES