Code comment improvement and clustering enabled check moved outside of lock.