cleaning up more code
added more fields