Code style + remove unnesessary parts