Cleaned up and added help