Removed unnecessary methods and classes.
Improved signature.