Un-complicate some code
1 file changed