Cleaned up helper
Removed ide helpers.
Cleanup and update