Feature/12 modernization and style changes