Added build infos supplied by maven and some code cleanup