Added angle to mesaurement, private methods instead of public, cosmetic changes.