cleaning up for best practices