js and helper cleaned up