Code cleanup + abstraction
Corrected access lists for the implicit action