Minor refactoring to maps implementations, added missing copyrights, added and updated comments.