added some labels cleaned up code