Replaced log writer by log

Replaced log writer by log (configuration: log4j.properties file).
Used the diamond operator for list and map construction.