Fix code style and spread of items