Cleans up class and improves readme