Removed mapper as it had almost no responsibility.
Removed boilerplate comments.