Removed parameter from constructor and minor modifications.