Cleaned up a little and -help