Add comment for future improvements
Remove nonexisting dependency
Remove obsolete braces
Use partially applied function to remove duplication