Clean up

Empty check is not needed.
Removed comments in preparation for better documentation.