Updated Givens

Cleaned up code, added comments