clean up macros.
layout.
comments.