clean ups
addressed comments