Styling and remove of unused functions