Cleaned up name
Cleaned up state handling