comments + some prettifications