Minor style improvements in input
Use better log system