Implement some forgotten code
Remove trailing whitespaces