cleanup of source code