Made arguments of assoc implicit
Cleaned up whitespace