merged analyzer into project + some styling