Changed code style settings
Updated components