Remove commented out code
Abstract away a bit more boilerplate for the common case.