Cleaned up some help code