Minor timing changes and cleanup