90% done it think

cleaned up constructor and identifiers  a little