Refactored Granularity class.

Signed off by: Diego Araújo <diegoamc90@gmail.com>