Removed unnecessary properties, renamed class and methods.