Added current data map as parameter to data map creation callback
Added comments, cleaned up usage of spaces and tabs in comments, aligned some statements